Fix quoted type tags and use them instead of pickling #4204
+93
−6
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.